From: Julien Danjou <julien@danjou.info>
Date: Fri, 1 Apr 2011 14:24:22 +0000 (+0000)
Subject: mm-view.el (mm-display-inline-fontify): Do not fontify with fundamental-mode.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4248
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=eac820e394597b18256007503515a11cc9a33a0e;p=emacs.git

mm-view.el (mm-display-inline-fontify): Do not fontify with fundamental-mode.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 262d3e30e8c..111a25bfe56 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-01  Julien Danjou  <julien@danjou.info>
+
+	* mm-view.el (mm-display-inline-fontify): Do not fontify with
+	fundamental-mode.
+
 2011-03-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-sum.el (gnus-update-marks): Revert intersection change, which
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index abd78b8de02..5a90f015aed 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -608,7 +608,9 @@ If MODE is not set, try to find mode automatically."
             (funcall mode)
           (set-auto-mode))
 	;; The mode function might have already turned on font-lock.
-	(unless (symbol-value 'font-lock-mode)
+        ;; Do not fontify if the guess mode is fundamental.
+	(unless (or (symbol-value 'font-lock-mode)
+                    (eq major-mode 'fundamental-mode))
 	  (font-lock-fontify-buffer)))
       ;; By default, XEmacs font-lock uses non-duplicable text
       ;; properties.  This code forces all the text properties